Allow advanced search to return archived questions

kitsune/search/base.py

@@ -284,7 +284,7 @@ def get_highlight_fields_options(self):
         ...
 
     @abstractmethod
-    def get_filter(self):
+    def get_filter(self, is_simple_search: bool):
         """A query which filters for all documents to be searched over."""
         ...
 
@@ -344,6 +344,10 @@ def __getitem__(self, key):
             return self.results[0]
         return self.results
 
+    def get_filter(self, is_simple_search: bool):
+        """Placeholder for subclasses, should be implemented there."""
+        raise NotImplementedError
+
     def build_query(self):
         """Build a query to search over a specific set of documents."""
         parsed = None
@@ -372,8 +376,9 @@ def run(self, key: Union[int, slice] = slice(0, settings.SEARCH_RESULTS_PER_PAGE
             **settings.ES_SEARCH_PARAMS
         )
 
-        # add the search class' filter
-        search = search.query(self.get_filter())
+        # filter method needs simple_search status
+        # (True for keyword search, False for advanced syntax)
+        search = search.query(self.get_filter(is_simple_search=not self.parse_query))
         # add highlights for the search class' highlight_fields
         for highlight_field, options in self.get_highlight_fields_options():
             search = search.highlight(highlight_field, **options)

kitsune/search/search.py

@@ -111,7 +111,7 @@ def get_highlight_fields_options(self):
         ]
         return [(field, FVH_HIGHLIGHT_OPTIONS) for field in fields]
 
-    def get_filter(self):
+    def get_filter(self, is_simple_search: bool):
         filters = [
             # restrict to the question index
             DSLQ("term", _index=self.get_index()),
@@ -124,10 +124,12 @@ def get_filter(self):
                     "gte": datetime.now(timezone.utc) - timedelta(days=QUESTION_DAYS_DELTA)
                 },
             ),
-            # exclude archived questions
-            DSLQ("term", question_is_archived=False),
         ]
 
+        if is_simple_search:
+            # Only exclude archived questions in simple search
+            filters.append(DSLQ("term", question_is_archived=False))
+
         if self.product:
             filters.append(DSLQ("term", question_product_id=self.product.id))
         return DSLQ(
@@ -201,13 +203,18 @@ def get_highlight_fields_options(self):
         ]
         return [(field, FVH_HIGHLIGHT_OPTIONS) for field in fields]
 
-    def get_filter(self):
+    def get_filter(self, is_simple_search: bool):
         # Add default filters:
         filters = [
             # limit scope to the Wiki index
             DSLQ("term", _index=self.get_index()),
             DSLQ("exists", field=f"title.{self.locale}"),
         ]
+
+        if is_simple_search:
+            # Only exclude archived documents in simple search
+            filters.append(DSLQ("term", is_archived=False))
+
         if self.product:
             filters.append(DSLQ("term", product_ids=self.product.id))
         return DSLQ("bool", filter=filters, must=self.build_query())
@@ -245,7 +252,8 @@ def get_fields(self):
     def get_highlight_fields_options(self):
         return []
 
-    def get_filter(self):
+    def get_filter(self, is_simple_search: bool):
+        # Note: Profile search doesn't seem to have an archived status
         return DSLQ(
             "boosting",
             positive=self.build_query(),
@@ -293,7 +301,7 @@ def get_settings(self):
     def get_highlight_fields_options(self):
         return []
 
-    def get_filter(self):
+    def get_filter(self, is_simple_search: bool):
         # Add default filters:
         filters = [
             # limit scope to the Forum index
@@ -366,9 +374,14 @@ def get_fields(self):
     def get_highlight_fields_options(self):
         return self._from_children("get_highlight_fields_options")
 
-    def get_filter(self):
+    def get_filter(self, is_simple_search: bool):
         # `should` with `minimum_should_match=1` acts like an OR filter
-        return DSLQ("bool", should=self._from_children("get_filter"), minimum_should_match=1)
+        # Pass the flag down to children filters
+        return DSLQ(
+            "bool",
+            should=[child.get_filter(is_simple_search) for child in self._children],
+            minimum_should_match=1,
+        )
 
     def make_result(self, hit):
         index = hit.meta.index